Use more universal paths

Conflicts:
	META-INF/com/google/android/aroma/exec/archidroid_init.sh
misc
misc