Merge "Move Java stuff out of base_rules.mk"