Fix Makefile for non embedded ROMs

Change-Id: Ia8d80b0fe392b0f7388d9b1e00d29c255d14313f
Merge branch 'cm-10.2' into martincz