Merge "LP64 fixes for media/libeffects"