Merge "Add cts hardware tests to continuous test." into froyo