Merge "CTS: Rename Compilation test classes" am: 74d60b2ed9
am: 7cda39517c

Change-Id: I83b682c22174512472c8237532fabb016c2b7bbf