Fixes #636.

Resolves a build error related to the recent removal of the android
support library. 

Signed-off-by: Jared Woolston <jwoolston@tenkiv.com>
Merge branch 'master' into scenegraph_dev