Conflicts: apps/CtsVerifier/AndroidManifest.xml tools/host/src/com/android/cts/Version.java Change-Id: I5e9642c74dd3381865e731567e7decebb9ab2b71