Merge "Fix page accounting for multidex" into oc-dev