Merge "Makefile: Pack brillo_update_payload and shflags into otatools."
am: 4dc400e753

* commit '4dc400e75336d0e09f509c9fd100c49cfb42ed5c':
  Makefile: Pack brillo_update_payload and shflags into otatools.