Merge changes I423c6c11,I09fe17f1

* changes:
  changing the rules following java package renaming for external/apache-harmony.
  Adding apache-harmony to cts.