Merge "init.rc: drop spurious trailing ':'." am: bce2fbcd93
am: 50bd95332a

Change-Id: Iaeb645fd692792dadb6b954c1674f1450aed0442