Merge "init.rc: Add nodev,noexec,nosuid to /config" am: 7238eca684 am: 53274d67ff
am: 3a48dfce2c  -s ours

Change-Id: I781014715daf8c8c971e92c38e4209804bf24701