Merge "64 bit mediaextractor"