Merge "init: group source files better in Android.bp" am: 2157b2065e

Change-Id: Idee5216e0674b9323e572e2ccd532a0aecd1c144