Merge "Add system/build.prop dependency on vendor/bootimg"