Merge "Fix page accounting for multidex"
am: 0e08ab440b

Change-Id: I01d03474398b2ab32066d1f0b67cc877de2fefaa