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

Change-Id: Iea0a9d3573dfd17e582e60239026c4c8e7f96e3a