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

Change-Id: Ief36e11fc91a7d69ace14f3741586f47c01297b1