Rebase to match aosp/master

We take aosp/master exactly. We're preserving no changes of our own.

Change-Id: Ie11acb74760542db6f271a623546bf2d494c8532