Merge "xaacdec plugin is not part of vndk"