[automerger skipped] Convert mock_android to Android.bp am: 07c37dcf01 am: 36e6eee47b am: d8d84909d5 -s ours
am skip reason: Change-Id I066fc62eb7eeab982a440542cc3d98e008b306ca with SHA-1 231e804f09 is in history

Change-Id: Ia1d4f846910cdad452da03c73c08320173dd0e72