Merge "Exclude MediaComponents from the build." into pi-dev
am: 247cc0a3c8

Change-Id: I5dcad14f686e46b55a8becc9ea6d92ae45777fb7