Revert "Revert "Revert "Fix build error"""

This reverts commit 5e9a64f37bb5bfdf9ca1639d6186a26abba88fc3.

Change-Id: Ie69f013056dadc5b9325e78a230de442b84b87f4
Merge "Revert "Revert "Revert "Fix build error"""" into android-4.4