Build fix

Change-Id: I72b62af13be75869ed2730d9ac1b9f8c4c0b9d63
Merge pull request #1 from asylumroms/lollipop

Build fix