Bump Android bom version
Update travis build to use Android L
Merge branch 'pr/13'