Merge arm-oabi.h into arm.h