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

Change-Id: Icb791eb1d7bcf9bdb3e0e4614c918a3e1c372a15