Merge changes from topic "art-enable-apex-libs"
am: 61a9328e80

Change-Id: I707ae6472fb0148848e12ec8fad7927ba65fc8a8