BAKED: make things look a bit more symetrical and cleaner hopefully everyone follows suit from here out. Also remove a call to apns from common.mk and set this all per device now.

Signed-off-by: travp624 <travp624@gmail.com>