tree a7a89e22dfb0a28bab2b322cd0765d44af87c0f5
parent fa617cdf97a1979c741a276d2220200a00372e4d
author Tao Bao <tbao@google.com> 1490753186 -0700
committer Tao Bao <tbao@google.com> 1490753232 -0700

Fix the bad merge (duplicate tests).

Test: mmma bootable/recovery
Change-Id: I909164fed84fb17a7e1cb2427cb88208a69dc052