Merge "Fix compressed stubs" into qt-dev
am: 6b1c8d6816

Change-Id: I24bb1cda428e2041a1cca6f8b87e7c865b9c03c4