Merge "Make Codec2 and BufferPool modules vndk"