m4: Fix build barriers in Android.mk

This was causing override warnings when building m7.

Change-Id: I7fcc47042ee3fd26b492e06e28c5f409b53e9747
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_device_htc_m4 into cd-4.4