Merge "Fix AudioTrack comments relating to use of restoreTrack_l()" into mnc-dev