Merge "Add arch variant support to android_app_import." am: a701d907 am: 7a6bb1d9 am: 833c5b89 am: 60e15f2f am: a636544d Change-Id: I765de8e97f4585a5fd84032964e3907bba44276d