Android plugin 0.6.+
Small cleanups