Merge "Fix a potential NPE when allocating space for compressed apex" into sc-dev