[build] Updated to android Lollipop
Merge pull request #125 from jacek-marchwicki/fix-android-lollipop