Merge "Makefile: Pack brillo_update_payload and shflags into otatools."