fix build (OTA)

Change-Id: I6f4e80b6dd989294beef121043049f6ceb30a954
Merge https://github.com/XPerience-NXT/android_build into HEAD