Merge \\"Use a NDK-compatible libjpeg\\" am: ab5395fa88
am: 788a0ecf88

Change-Id: Iaef2ca8e22a0db5595ab63bc438e7b688249a908