android: swtich branch

Change-Id: I15a5ee7c5c289b09e075ce30792302a7b74d792d