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

* commit '545f226db0978639aba41f16f623a395dad4209c':
  Add ro.build.system_root_image