Merge "Revert "Frameworks/base: Compiled-classes support"" am: 087bae3ffe am: f6786aeb64
am: 42f4090f85

Change-Id: I3717a17cecce29ebee794fae3a76eab816d0ff28