am d0425868: Merge "Fix CtsVerifier Proguard Issues" into gingerbread

* commit 'd0425868c8f4dca76ff195fd775368db6400c237':
  Fix CtsVerifier Proguard Issues