Merge "Reduce OatWriter RAM usage for non compilation filters" am: a638954a75
am: 0325381c9e

Change-Id: I96c2694af0705d1898ebedc419ebaec3d2712a36