Merge \"Use a NDK-compatible libjpeg\"
am: 0f763c5d10

Change-Id: Ie43896a8e9ff28542a363caf0d5c74092b5f9145