Merge "SF: rev android.hardware.graphics.common to V3"