Merge changes I188e77ec,I6d19c734

* changes:
  Avoid conflict with libcore.java.util.logging.OldLoggerTest
  Remove more classes and resources that collide with those in libcore