Merge "Require targetSdkVersion>=O for updated graphics driver packages" into oc-dev am: 40b274915e
am: 4e99819ba6

Change-Id: I721dd6b03d7f5938de7e81b8fb25feb04babaa6a