p880: include apn list, remove obsolete Torch

Change-Id: I863d2f88f37ec4852a79ecaf66a58195b93bbe07