am 46afd7f9: Merge "Add ro.build.system_root_image"

* commit '46afd7f981406e47740c46253aa16af1ab78eb9c':
  Add ro.build.system_root_image