Merge "MediaCodec: LinearBlock API for optional crypto" into rvc-dev am: 968b1066e5

Change-Id: I0e55485dded4799f4ce808f38d8c817c3aec4b3b