Merge "Fix AudioNativeTest for Android Wear" into cw-f-dev am: ed224b5b0d am: 75a0c8268e
am: 3f0477021b

Change-Id: Ib2df31ff5dd9a115eb312c8af64bccc9b4768a52