Revert "androidpn"

This reverts commit 1849ce5e4d9444dab401daa5dba8201be17c3536.