Merge "Handle RawData case for DexLayout"
am: 81464523d6

Change-Id: Ibf76d8e49e803dd8e2922a4adb7fd04ba7da03f1