Merge "Update Android.bp with arch-specific version scripts"