Add ro.build.system_root_image am: fa7f9f7e0c  -s ours
am: 3e52a195f1

* commit '3e52a195f1bd5e455a5fee2ce5f73780b3454d5e':
  Add ro.build.system_root_image