vendor: Squash apns-conf update from CM

Change-Id: Ic7d4613cbde382e0a7ad8db1ffddf45797dfe328
vendor: Add an english only maguro build

This is mainly for personal builds. There is no need to include all
locales when I only use English.

Change-Id: Ia48aa8ae1923fd238994c95a3c9750715fc3e87b