Merge "Fix whitespace errors" into qt-dev-plus-aosp
am: 9efb491ad9

Change-Id: I5b9444792e87b0d628b1f9f21df04c576517d3f6