tree ea4f8950e75747330c00450c35b5f815355af17d
parent 78871886c55d934f961bb848ba17c62887962fb4
parent fb5af331eca64929faa3a9c284e8ebea9a6bb198
author android-build-team Robot <android-build-team-robot@google.com> 1521751374 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1521751374 +0000

Merge cherrypicks of [3782287, 3782954, 3783025, 3783026, 3783027, 3783028, 3783029, 3783030, 3783164, 3783165, 3783167, 3783168, 3783170, 3783171, 3783172, 3782288, 3783031, 3782196, 3782955] into oc-m4-release

Change-Id: Ie5bb0080290b16322833b5ca450689b3ff66892a