Merge "Prune class path classes from profile" into nyc-dev
am: f498cd2a5e

* commit 'f498cd2a5e308ec4b66a1a0e363fe1c387bf1307':
  Prune class path classes from profile

Change-Id: Ibd4f400ea5dfee7a0536fd4a2923d74e74029416