tree d43751673aa9ce4db385e36801575e8195423a7c
parent e39d21201183752fd404e4ede0a52e39754774b8
parent 16f9b39c69626093ae9225b458739707c9a3b4e7
author android-build-team Robot <android-build-team-robot@google.com> 1539966822 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1539966822 +0000

Merge cherrypicks of [5313290, 5313323, 5313343, 5313415, 5313291, 5313441, 5313557, 5313344, 5313383, 5313384, 5313324, 5313325, 5313326, 5313294, 5313295, 5313296, 5313498] into oc-m8-release

Change-Id: If45233ec1637604dcb769efb42ed3acb1b2857a0