Merge changes I1d66ba0d,I84890f1b

* changes:
  java_api_contribution system module definitions for libcore
  java_api_contribution module definitions for libcore