Merge "graphics.h: Add android_hdr_t" into nyc-dev