Merge "Add graphics-base-v1.2 autogen headers"