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

Change-Id: I9ef9a16a6175840f8f72800400bcdc6d2ec9684e