Add proper annotations for Android SDK