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