am: 4283aa9f -s ours * commit '4283aa9f': Reduce memory usage in GVN Change-Id: I9d9238216c32b40d079b96a5ef569c57012597ea