Merge "Switch from init to init_system to match base_system.mk" am: e2137bae...

Merge "Switch from init to init_system to match base_system.mk" am: e2137bae am: b67fdb4f am: 614681d0

Original change: https://android-review.googlesource.com/c/platform/build/+/2282796



Change-Id: If6f14010454fb3e027bdbf6913e52f5cd7f1e3ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>