Merge "Document CryptoInfo Settings for CENC 2016 & HLS Audio" into pi-dev
am: 6ab6a9d433

Change-Id: I720bd982b19a619f28ab4fe96a66e9683dbb7d14