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