am bf7f3684: am 81360178: Merge "Move AndroidConfig.hs to the build project." into jb-mr1-dev

* commit 'bf7f368459fc2413ae45d1a06421ebc8bec5098d':
  Move AndroidConfig.hs to the build project.