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

* commit 'b998054f50043c23e8599ee3cfae058ac378c5cb':
  Add system/build.prop dependency on vendor/bootimg