Some fixes to make it work with the latest libraries#5

alexcustos wants to merge 1 commit into

andrey7mel:masterandrey7mel/android-step-by-step:masterfrom

alexcustos:masterCopy head branch name to clipboard