Android 8.0.0 release 4
merge in oc-release history after reset to master