update aosp branch r1.2