Bug 959597 - Odinmonkey (ARM): fix a commit conflict with bug 964005. r=jandem