Merge "Fix failure at AudioTrack_ListenerTest#testAudioTrackCallback" into oc-mr1-dev am: 310dd0a2d9
am: fd513fff31

Change-Id: Ic28d34a8cf8bed962642a7e2535d6936d69495f4