Merge "Some cleanup for <uses-library> change." into nyc-dev
am: 9f013fe

* commit '9f013fe71ecf03c9c9696599ba82715d84e45365':
  Some cleanup for <uses-library> change.

Change-Id: I578087f34b8bfa8cb420ca53f7856e3743b28036