Merge "clear calling identity to dexopt" into mnc-dev