Merge "Remove a dependency on AndroidConfig.h."