Updated Android makefiles and releasetools script with correct references to model names