Fix build for inclusion in Android external tree
3 files changed