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

Change-Id: I6f1a0a60ddd982c21b67cd52407d582a53e514af