Merge "Remove non-NDK headers from the NDK."