[#7] Fix for (at least) the Nexus 5
Merge remote-tracking branch 'origin/master'
[#7] Fix for (at least) the Nexus 5 (now doesn't break support for device with minsdk < 11)