ANDROID: mm: fix up new call to vma_merge()

commit 60500a42 ("ANDROID: mm: add a field to store names for
private anonymous memory") changed the parameters to vma_merge() which
causes any new use of that function upstream to break the build.

So fix up the new call by adding the needed extra parameter.

Maybe someday this patch could be dropped to prevent this.

Bug: 120441514
Cc: Colin Cross <ccross@android.com>
Cc: Dmitry Shmidt <dimitrysh@google.com>
Cc: Amit Pundir <amit.pundir@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I05629d408449124215ef9181223a686f4855cbf6