Fixed compile errors on other devices

Change-Id: I840d209bd36d99b28b50ec3fc1693806ed55208a