Merge "aidegen: Collect all java sources from makefile system."