Merge "Revert "Frameworks/base: Compiled-classes support""