am 6338cf39: Merge "Read config.ini for Android build too" into idea133  Auto-merge: 0640d15

* commit '6338cf39a8985a86923a6325457086f701bdc1bc':
  Read config.ini for Android build too