Merge changes from topic 'libOpenMAXAL-ndk_library' am: 8924e901a8 am: e1c9e1663c
am: 102b962ded

Change-Id: Icca7eb5b7b0e85ab1d59114f0273bfa93ed1fb9c