Merge "Enable CodecBase plugin in MediaCodec by default" into pi-dev am: 9f39994c14
am: fd41a706d0

Change-Id: I670973f5310690b1880697524c8b7e3d8296f88c