am 983ce573: Merge "Fix SELinux labeling for system.img"

* commit '983ce5738cee0bf78b87d6274fe1387129768302':
  Fix SELinux labeling for system.img