In anticipation of my N6 leaving the wearhouse on the 17th, take a potshot w/ some reasonable-looking shamu source

Change-Id: Iceb8c0c08358692c1be45560c23e11e789c2d0d6
Hopefully fix media related borked builds: grouper, mako dlx, moto msm, tf700,

Change-Id: I104a72f0d2c82e0543895543c218702c914644c2
Merge remote-tracking branch 'upstream/L5' into L5

Conflicts:
	default.xml