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

Change-Id: Ifb6f1be93fb40fa49f850f3ac9cb9bf480a1a90d