Merge "Add check that classpath is up to date to getDexOptNeeded"