Merge "Handle RawData case for DexLayout"