Dexmaker --> android_external_fdlibm to aosp

Change-Id: Id21800458d405454fadb93a1d9d24ac7a7c49df0

Conflicts:
	default.xml