Refactor to allow running outside of Android.
Merge branch 'refs/heads/portable_java'