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

Change-Id: I2bc403c0ccb2f8e6a1a3e4de4541c810829457d2