Revert "Hardcode 7 custom targets for phones"

This reverts commit 2e6accf37a65bf65262ce0c6559b364e64082cd8.

Change-Id: I4460e40dead4d2bc68a51ac874de40ba1161a926
Merge "Revert "Hardcode 7 custom targets for phones"" into kitkat