build: fix device assertions

Change-Id: Ia5c5bfba583fdc85e3c505f4b58df8e606615c9d
Signed-off-by: Jonathan Steadman <xxwhitehawk@gmail.com>
Merge branch 'jb-mr1' of https://github.com/AOKP/build into jb-mr1

Conflicts:
	tools/releasetools/ota_from_target_files