Fixes symbolics links. Updates android.mk files.