Merge "Fix compiler warnings in frameworks/av/media/ndk." into nyc-dev am: dadb4ea87f
am: e9def8832a

* commit 'e9def8832a04e16823c21639d815359c816c57a9':
  Fix compiler warnings in frameworks/av/media/ndk.