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