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

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