Merge "graphics.common V3 -> V4" into tm-qpr-dev-plus-aosp