Merge "Use armv7-a when building sdk." am: 42c9da3ef7
am: 18b83792e3

Change-Id: If44428f4df666fadf446aede178eb572f3f2a4e1