[automerger skipped] DO NOT MERGE: Bump CTS and CTS_Instant version to 9.0_r7
am: 8aadd55a35 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie72a7f91a135f208d3a8c9ed1dd3a4e9d54fb00f
tree: 84351a920725456e01d7f1a3543fc7e6c83cf523
  1. common/
  2. tools/
  3. Android.mk
  4. test_defs.sh