proc: task_mmu: fix up merge issue with 3.18.103

This fixes a merge issue with 3.18.103 and the android-3.18 branch.  I
took the merge in the incorrect order for this file.

Change-Id: I7b67efd0486114214d6aed673915a58b8cc1d56e
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>