am 57069e59: Merge "Remove Windows AndroidConfig.h."

* commit '57069e5974c3224550c3cf3a12dbe6ffac4b0c79':
  Remove Windows AndroidConfig.h.