Reconcile target makefiles

Change-Id: I29fa940d5f3e75521040b5ef226653bba3cda21e