Merge "Move ro.boot related properties to bootloader_prop"