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

Change-Id: Ic0004f471af3a6cdaf1d14e9d3824141ea999326