Reset to state of AOSP (i.e. MR1.1 + AOSP contributions). DO NOT MERGE.