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

* commit '68fd21137b09523ebaa3748e57d7eedd0d0ec2ef':
  Add ro.build.system_root_image