Merge "List stable libraries media apex relies on." am: fc0f79f8a8
am: 5698f77f5f

Change-Id: Ia7aa41c791b25417b8929b32c82c8de55920936d