tree a97d11d15772fc52d6b95d722cc9d0d93a7b9eb3
parent 313ff2895344f4ae69010c23804f4d454ae0b33a
parent 854ac60f94bf63a88b90ccef648bc5b0073a76be
author android-build-team Robot <android-build-team-robot@google.com> 1519689200 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1519689200 +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: I7c9c46ea767f4332fbcb7bca50eabaa446acacdc