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

Change-Id: Ic66799590cf88a01529d3c584248d35bc6153033