Final changes to android.

Signed-off-by: Tim Van Roeyen <tim.vanroeyen@student.kdg.be>