Android 8.0.0 release 7
Merge cherrypicks of [2489285, 2489286, 2489323, 2489399, 2489257, 2489326] into oc-release

Change-Id: I8b31b1f2eb4108cb522113428dab57e7eda1903f