Merge "Frameworks/base: Change android.util.Log multiline logging"