i605: fix proper building with merge of common t0lte

Change-Id: I37e5267ff388b557fb8f8172cd0168a6149e75a8
Merge "i605: fix proper building with merge of common t0lte" into cm-10.1