Merge "Clean up old references to android.support in Activity and Fragment"