Get apns from cfx vendor, misc cleanup

Change-Id: Iefc2323d7975952265a04274206a75c0de426155