Gardening M38 for Android port

Remove classes_dir dependency and fix runtime issue.
Verified instrumentation tests and packaging tool.