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