Merge "Fix potential race in DexManager" into oc-dev am: c54fa39d8b
am: 43284ad8b7

Change-Id: I72dc2159438834c568a43ea8101109f34ea15c9a