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