Merge "Do not return an error if the dalvik-cache odex is missing" into oc-dev am: d6ca10b76d
am: 5249e61342

Change-Id: Ie2da25c82e6979adc04486f17a71ca4a1d355f8c