Merge "Require targetSdkVersion>=O for updated graphics driver packages" into oc-dev