Remove ARM specific patches

Change-Id: Ic78893140a9675cc406e1cccf5743ba86094c173