am 121e53ca: am e1f21520: Merge "Add build.prop to root ramdisk"

* commit '121e53cace8f2cea7b847c5efacfba06325e59f0':
  Add build.prop to root ramdisk