Clean up APNs for au and SoftBank (Japan)

Conflicts:
	prebuilt/etc/apns-conf.xml

Change-Id: I67223792af2abee5c9372cbe47745dbfa6b525a6