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

Change-Id: Ida223bd8ae6e95584f9aed779b09611e8ab5aaac