Bring up-to-date with AOSP