
This reverts commit 44c724e185
.
Reason for revert: this did not fix our slowness problem, which
was slow CreateChange calls on Android's platform/frameworks/base
when specifying a merge. On closer inspection, generating the merge
reads too much data.
Change-Id: I9fb9a074bc7ae9da13ef262a5a9a7a2596ec0387