tree e118976d66194e4cb64f9f854598bbd2d81054d7
parent de781bbb48d4a307190192313752cd675348abc8
parent 3aeaef6f2848122c051dd0ecc01624b951303449
author android-build-team Robot <android-build-team-robot@google.com> 1539966825 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1539966825 +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: I62e39466baf7cbb474eb521994e39f55b1fd3205