tree 14d0ca6d6e8e77e27663b9fac5304b7b125ee9ce
parent dd6cda6487fb698f1a1b8bf546d9a95ba62cb8a7
parent 7a3e602f9b91d604b9493b04ada405c2d8bdd1e3
author android-build-team Robot <android-build-team-robot@google.com> 1521751367 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1521751367 +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: I6f635dc6b30831b46d040ca15149692f851fbb47