Merge "Add @NotNull, @Nullable, and @IntDef/@StringDef annotations"