am 9fe3045f: am 2f5539a4: am 7a042ce4: am 9376f14e: Merge "Change sample native-codec\'s minSDK to android-21"
* commit '9fe3045fe1e1611392cf7ab4a52d340bf35d9c90':
This commit is contained in: