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