Merge "Add missing formats from hardware_buffer.h to java AHB" into main