Allow sideload to be used in conjunction with other commands.

Change-Id: I8b35a010e5fdb36cec991c56d5cd0def72865308

Conflicts:

	Android.mk