Updated Android macros to work with layout of latest SDK. Now requires the tools.version property to be set so that we know where to find the tools.