Merge "NDK: Last cleanup of the platform headers" into gingerbread