Merge "Revert "init: use ro.init.subcontexts_enabled to enable subcontexts"" am: f71a3d66b3 am: a3f19e0261
am: 589ecf0ca8

Change-Id: I82442cbc65145d9272a45fe761a68eb80865bfa1