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

Change-Id: I8c42e7f3f25dabc79e238407ea6069ce16f77ada