Update build target to restrict it to arm and x86 only
am: 50365007b6

Change-Id: If461907f6f797e5fda72ef47147594a4ed7f41a9