Latest greatest Android L
Merge branch 'pr/421'

closes #421