Merge "[framework] Add check that classpath is up to date to getDexOptNeeded"
am: 945b1dc43e

Change-Id: Ib9865f950f595ab840ceb3afd60ad52d33cb5c01