Add actions to merge everything to "get right" or "keep left"

Bug: 532438
Change-Id: Ia582ceb05ce4fc7a1c43fa3fb22da123bad28cfc
9 files changed