Fix build; un-pin attribute destined for API 17 or later to prevent
further automerge antics.

Change-Id: I547dc0abd8db09e8aefc89123e4fb7f73eea712b
2 files changed