Clean up APEX library lists.
am: 023c2181ee

Change-Id: I2e6b1a2dcf445f4c82a8f88192bc8d71539a29c6