Merge "[framework] Add check that classpath is up to date to getDexOptNeeded" am: 945b1dc43e am: 8952f058ff
am: b3145221ae  -s ours

Change-Id: Ic6fae72706502b6681b710ddfd35fccd4d0b0b61