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