Unify APN installtion, combined with removal of co-responding change in build

Change-Id: I8906019d0285082e312653b18628e36801856e13
Misc permissions fixes

Change-Id: Ia074bffd25541af255d0a72cb398a0d53f3ee7c6