Merge "Lowered surface flinger trace buffer to 5MB."