(BB10) Start cleaning up some include header references
(Android) Uniquely name symbols - platform_android.c