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

Change-Id: Ic478ce5ab6ef31c4c036e48c9717cef576baf2ae