setup-makefiles: Fix a few errors

Change-Id: I5ba485b5cde348b1b995218ef30da116b62b6c43
Update gps configuration

Change-Id: I7e2d3143e1d0a3e257a3cd95eebf9bd488e7dc5b
Merge branch 'cm-11.0' into martincz