Tiny fixes of Andriod build