Merge "Remove deprecated media sample."
am: 8f7bfcff2b

Change-Id: I8efd773a12d2b948613b2e624d7be92c3a80f607