Merge changes I9b3f4c11,Ie51c4933

* changes:
  Remove @CorePlatformApi usage from the ojluni/ AlgorithmId.java sources
  Add explicit @hide javadoc and @CorePlatformApi and @IntraCoreApi to Compatibility.ChangeConfig