buildlink2.mk files back into the main trunk.
This is part of the japanese category retirement. CATEGORIES and pathnames to japanese/ adjusted.