Merge "Camera NDK: internal->public format conversion"
am: fb208d4659

Change-Id: I663bfb69380413cead3ffca367986149650afd99