mako widewine so's

Change-Id: Idf178f9c5c96a71d2bbdb9ea2b73995b916cc6bd
Merge remote-tracking branch 'upstream/jellybean' into HEAD