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

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