tree 07a68c6ddbee4e1b5feb84e7211a77cfd7d3c4a8
parent 76d77fd593f9edad247e44d97e766389572f6eb4
author Daniel Cashman <dcashman@google.com> 1505169854 +0000
committer Dan Cashman <dcashman@google.com> 1505855698 -0700

Bug revert AOSP cherry-picks to enable big diff.

The following commits were cherry-picked from internal master to AOSP,
but to avoid merge-conflicts we'll do a large diff instead of individual
cherry-picks:
521742e979b18509ecbd84ed05aa0b569ae278d1
9aefc916f52b9cda4969c58562cfb7bdda8230ab
3686efcadbdef6fdde8182fdf13a504535319619
de51e7decea518b3789035a01c454bf937cab3ad
fff3fe2f08d75b3408bc1a3f16388531dd3c8786

Bug: 37916906
Test: angler builds and boots.
Merged-In: Ie010cc12ae866dbb97c387471f433158d3b699f3
Change-Id: I5126ebe88b9c76a74690ecf95851d389cfc22d1f