Merge change I8a7a4c56

* changes:
  Split libcore/Android.mk into two files, one for Java code and one for native code, and make each have a set of rules for building on the host.