am 624220c1: Merge "Remove useless stuff from "AndroidConfig.h"."

* commit '624220c18a6fd4cabbc75344248eb770985df93c':
  Remove useless stuff from "AndroidConfig.h".