Merge "Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures"