Merge "Add uses-library option to EDI manifest generator" into oreo-cts-dev
am: 8173efa4ef

Change-Id: Id3b75adcd6239a880c6569e40d41c75a73075e43