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

* commit 'e1f2152015069b595f9f62f8b74e26baa5ebad9d':
  Add build.prop to root ramdisk