Merge "frameworks/av/media portion of removing YouTube specific error codes"