Merge "Remove Windows AndroidConfig.h."