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