Merge "Fix whitespace errors" into qt-dev-plus-aosp