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