Merge "Remove compiled classes list" am: 3adfec2de3
am: 3a3fc7a43b

Change-Id: Ia40246372d156d308c4e3930c3789dfe0a1010f8