tree c2b49fe694684fc4955f3bdcb40989fbe9760a10
parent c38409166ec40fda213bb36b920c371b57e06035
parent ef9e667bd58a467a0e17fa8adc5340093736f465
author android-build-team Robot <android-build-team-robot@google.com> 1534382695 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1534382695 +0000

Merge cherrypicks of [4787660, 4787680, 4787071, 4787700, 4787592, 4787701, 4787720, 4787721, 4787072, 4787073, 4787074, 4787075, 4787076, 4787077, 4787740, 4787760, 4787722, 4787723, 4787724, 4787725, 4787726, 4787727, 4787728, 4787729, 4787730, 4787731] into oc-m8-release

Change-Id: I14f7e1c9e6d1c66c843c17b71827c55c739d364d