Merge "Fix Build" into froyo
tree: 583bff60faec1ccb72e30bf69517c5d7509e9e63
  1. tests/