Stop #define'ing __ANDROID_API__.

Also normalize the non-bionic definitions of __INTRODUCED_IN() to match
the majority.

Bug: http://b/178449269
Test: treehugger
Change-Id: I378a6d8a01999958f397c896a375d38a9de43f8f
3 files changed