do not include gapps
change filename and otaid
use OTAPACKAGE supplied by makefile instead of guessing