Merge "Remove --ignore-classes-on-classpath argument" am: c02168f5d1 am: 481ba3e20a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1697265

Change-Id: I24b7b0a0673b1601b31b1983a3508349a95b6f4d