Updated aosp revisions to r3.1 from r2.2