tree e81a0ef30773ebe1d9972153e2772b94f7a08ffe
parent aff671f1dac4231730bee97d5ecf1390b20244dd
author Daniel Xie <dxie@google.com> 1443723919 -0700
committer Daniel Xie <dxie@google.com> 1443723981 +0000

added back adopthost test removed video encoding test.  

bug: 23827982

Change-Id: I6edce0ea4678a13b4906b1e73657125135db3e51