Remove setting of Android variable.
Merge topic 'Android-platform' into next

986c6f69 Remove setting of Android variable.