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

* commit '7a042ce40e2c4c91ac90ce1e209abe0d7cc8ab14':
  Change sample native-codec's minSDK to android-21