Merge "No longer honor `DONT_INCLUDE_RUNTIME_APEX`."