Merge changes I00d3f12c,Ia4b25dae

* changes:
  Revert an unnecessary diff vs upstream in Throwables.java.
  Add Android-changed markers to Throwable.