tree dcaeb0d9cc57f64383c5eb3a7d8e3a4707c929d9
parent 12621e8897d14f3b57eeb5ff09f6bd9cb638d202
parent 08dbcc848951bdf8839d9654ae0d1d8d576834de
author android-build-team Robot <android-build-team-robot@google.com> 1519689192 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1519689192 +0000

Merge cherrypicks of [3661626, 3661980, 3662429, 3661545, 3661546, 3661579, 3661580, 3662430, 3661547, 3661548, 3661549, 3661550, 3662578, 3662579, 3662580, 3662581, 3662582, 3662583, 3661597, 3661598, 3661551, 3661552, 3661553, 3661554, 3661555, 3662596, 3662597, 3662598, 3662599, 3662584, 3662585, 3662586, 3662616, 3662617, 3662618] into oc-m4-release

Change-Id: I57fcf72d74cc067b0e60da8269afecd06a2cf766