Merge "Add more AIMAGE_FORMAT for RGB formats"