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