Merge "Throw IAE when crypto or descrambler is not given for secure codec" into oc-dev
am: e09e96617a

Change-Id: If49a9bb93be590fad894896c36272355236ecd55