Merge "Don't add API annotations in the internal R.java"