Merge "Build: Use phone compiled-classes in core_minimal am: 695b28f67c am: ea33f4f768" into nyc-mr1-dev-plus-aosp