reconcile with open-source gingerbread CTS

Change-Id: I48668c65b9c0f0921954d309b4b53e026af3a86f
tree: 7a273ae1cfe98a23f6266583ae1be4fd95fb4ad1
  1. tests/