Merge "init: use ro.init.subcontexts_enabled to enable subcontexts" am: 99016bce92
am: 2f5b8bb3f0

Change-Id: I5c0ab48cd1ad208b2eb3d499d7f1b4473417b6c4