Merge "Fix incorrect @hide usage in libcore" am: 1f3aaf82cb
am: 04785955b5

* commit '04785955b5be7dc1ba164a0ae02c306b4fdd680d':
  Fix incorrect @hide usage in libcore