sprint 7 merge
Merge branch 'master' of https://github.com/kdflint/northbridge-android