Options Cleanup

 - remove ugly Hashmap passing
 - create ApkOptions
 - refactor based on ApkOptions