Merge "init: group source files better in Android.bp" am: 2157b2065e am: 32f0c57841 am: 493c4fa9e0

Change-Id: I4e7cf9b005248aa47259e03c049af1f4ab57fed2