Clean up APEX library lists. am: 023c2181ee
am: 60f3bc5b89

Change-Id: I9de823a6cb3ed638e850395e99fd330b6cba170f