Merge "Add check that classpath is up to date to getDexOptNeeded"
am: 9e76f430e7

Change-Id: I556a54f8bcf9790fb182218b9a3f9ef2599a1bb6