tree 46e1a76e378c9f2bd444d36bc4c8e5255f59a38d
parent a2270ff091692218c92084eec34d472f2e65f1b4
parent b2cd161b9bfa70281ebf5fa77d737cc5575bc1f4
author android-build-team Robot <android-build-team-robot@google.com> 1539966820 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1539966820 +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: I359fc572f1d806c7ce3a6cc626267965ac25b923