Merge "Support to pass <uses-library> option through to dex2oat." am: 34494f2c4a
am: 0e40c49203  -s ours

* commit '0e40c492037bc9d607e6b2460fa3f9fd1e8f4c96':
  Support to pass <uses-library> option through to dex2oat.

Change-Id: Iaa4da8d8e36667e5a6b31902549d7708d3857c5c