CONFIG_USB_G_ANDROID breaks under gcc6, rather remove than fix
CONFIG_NET_ACTIVITY_STATS was automatically selected by android support.
It publishes data in /proc/activity collected upon tcp send/recv, when
CONFIG_UID_STAT(=y) is selected as well. Probably could be removed as
well, but re-enable it to keep the delta against config.old minimal.

Signed-off-by: Andreas Fenkart <andreas.fenkart@dev.digitalstrom.org>