Fix build error, corrupted makefiles.

Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>
Change-Id: I6d278295dabbc30e0c789ecd175a21debed4b938
Merge branch 'kitkat' of github.com:AOSPA/android_vendor_pa into kitkat