Merge "Fix page accounting for multidex"