Merge "Tests for mapping android name to uid" into jb-mr1-dev