tree b9b66071b0dc06a9a7c649447275798db197c8b0
parent c84df654377f0a16be74399f46af6abd3af7e82f
parent ca1a1094a8262d5a41b660570cf6121b26d2d8aa
author android-build-team Robot <android-build-team-robot@google.com> 1497633710 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1497633710 +0000

Merge cherrypicks of [2419615, 2419671, 2419656, 2419633, 2419709, 2419634, 2419635, 2419617, 2419618, 2419619, 2419658, 2419697, 2419659, 2419673, 2419726, 2419747, 2419596, 2419748, 2419597, 2419636, 2419711, 2419749, 2419660, 2419713, 2419714, 2419727, 2419674, 2419782, 2419752, 2419731, 2419732, 2419677, 2419717, 2419734, 2419784] into nyc-mr2-security-c-release

Change-Id: I8ad2f36ffeb8ead54643cf3d7707099f422df47c