am 512df522: am 525d2597: am d57e21f4: am a8a7282c: Merge "Fix CTS build" into mnc-dev

* commit '512df522ba49cf0cd4c6062ef89a66651231415a':
  Fix CTS build
tree: 47ce917974dbd592f476434fd9e085dcfdb14494
  1. tests/