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

Change-Id: I0ff52940cbce928720fcdbb08ee0ad2da8a55be0