Merge pull request #34 from tadfisher/master

Bump android.platform to version 17