Merge "Remove unused entries from AndroidConfig.h."