Merge "OtaDexopt: Fix after-ota space measure" into nyc-mr1-dev