am 6943a913: am 5dcd8d72: Merge "Fix failed test case when running framework auto test."

# By xiaohui wang
# Via Android Git Automerger (1) and others
* commit '6943a913f8bb044f40f94a933c1e2b24e103f59a':
  Fix failed test case when running framework auto test.
tree: a84aa3c83625ab1fc75b0b36a5106dc032cc60cd
  1. src/
  2. tests/
  3. tools/
  4. Android.mk
  5. CleanSpec.mk