Use our own build target list

Change-Id: I169074b34e2132f27251cb9fb5b8463a7b4553f9
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1