Merge "Update CTS test for libraries moved to the Runtime APEX."