fixup after the merge with google kernel-common android-3.0

Change-Id: Id6e70e95faa2bac8e29505d22f4114d684d78442