sample
fix lollipop bug & hardware acceleration
Merge remote-tracking branch 'origin/master'