Merge pull request #3371 from theuni/android-jholder-rewrite