Merge "Move build modules from top-level to core/java/" into sc-dev