Updated Final Version of AndroidGenerator