Merge "Add more AIMAGE_FORMAT for RGB formats" am: 1df67b1b3a am: 0942860c57
am: 5a63f4ce64

Change-Id: Ib0af5fb7ac444fc5687d427ffe1d0bbbe0b716c5