repackaging

  * adjust depends
  * cleanup

Change-Id: If826ab634d8ce770320135f2dbd52a6e6b610b5a