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

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