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

Change-Id: Ia8bbc73911c0bcb9c1ec53bb4feb3224fa425a39