Updates needed for Ti SDK 3.2 and Android build