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

Change-Id: Idc45d2ba350461c24d70df2e6afa1cbd4d58c425