Merge "Be more accepting of dex2oat errors." into mnc-dev