Merge "Add __ANDROID_SDK_VERSION__=<ver> macro" into rvc-dev am: e989a8cb am: 7ea9b808 am: d4e4ea78 Change-Id: I6100e3d19ccc9f200522437ff9a19345731c01dd