Merge "[bit] Use aapt2 instead of aapt, and don't also adb install apps on the system partition"