Merge "Remove useless stuff from "AndroidConfig.h"."