Merge "init: separate init packaging for mainline"
am: 89bf115a70

Change-Id: I63fc45defb846d320b18ee2e5eb928bc38f64097