Revert "fix build"

This reverts commit df8da74fe4fa72ef2946d7a381e6c1de0e70d463.

Change-Id: I74837624cdd5ba73fd948833f3a47edf0383fb1c
Merge "Revert "fix build"" into kitkat