fix building

Change-Id: I60d2c30db6e56bc03d099b3dd03d57706dfac13d
Merge remote-tracking branch 'omnirom/android-5.0' into android-5.0
fix building