am 2f5539a4: am 7a042ce4: am 9376f14e: Merge "Change sample native-codec\'s minSDK to android-21"

* commit '2f5539a4eb682e0ad9b44641f5d98af0d97fed9a':