Merge "Pass TARGET_BUILD_PDK to soong" am: 7bc6eb12f4 am: 999cc61a33
am: a7f07f6750

Change-Id: I2d5b90eae127bd5c050f76f568047b4783371d20