Merge "fix b/62040757 - bad pointer to native audioplayer in 32-bit builds." into oc-dev am: 453b68a9b8
am: cd82f70f91

Change-Id: I39ee98f28d81f3e0f93732a561df3c6b5548f0fe