This undoes the automerger skip which occured in commit e740c84dc32180214a7fd157105d6c18d30408ee and replays it as a standard (NOT -s ours) merge. Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086
bug: 19298571 Change-Id: I5a4d6df6e7c8dd0e1f9ffb652375fa265b677013
Change-Id: I93b57161b3e519164dab551068411f686d772596