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

Change-Id: I2cb6bf873f58489e88d701a7151c163e1a133162