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

Change-Id: I588c345647455acef2a6322de8039da28128a3e2