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

Change-Id: I320d23d613bccedae64fa12eaef3b7f91743e648