Android 5 update
Merge pull request #67 from SeabassNg/trunk

Android 5 update