Merge "changing the rules following java package renaming for external/apache-harmony."