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

Change-Id: I17b728eefa6ba03b10bd4c980cdbec5e8de9e5ed