Android 8.0.0 release 3
merge in oc-release history after reset to oc-dev