Merge "Add Android U API level to NDK headers"