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

Change-Id: I2513daa55e3f3bcf76ec62a9013d326b528168d3