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

* commit '70a4a6a3323885b0f2701b9a6fe3d2eea2152a23':
  changing the rules following java package renaming for external/apache-harmony.