Merge "Remove needless bootloader_prop rule"