Merge change I987dbde8

* changes:
  Fix full stagefright build in master, various warnings/errors in omx_jpeg_decoder