Merge "remove __linux__ in AndroidConfig.h"