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

Change-Id: If0fda9d789e7ea5771a53420fdcdfe34d4a8286f