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

Change-Id: I3c97aa4fae6c5fb7ea9ea26804735700888a3298