Merge "Stop Facebook crashing with NoSuchFieldException."