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

Change-Id: I242ebb310a23fbf768a972d39c8c24cd9c1c4d35