Merge "Remove compiled classes list" am: 3adfec2de3 am: 3a3fc7a43b
am: 8e50922263  -s ours

Change-Id: I2dd835282a9de847cd3e5fd0e5a0e54bff2538af