Add support for max-target-s

Bug: 169748350
Test: make
Change-Id: I3d7c32b18bb6b64d69632f0799aa48672b8712d7
Merged-In: I3d7c32b18bb6b64d69632f0799aa48672b8712d7
2 files changed