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

Change-Id: I29dad564098ae4bc2b61a8ccde73622b8187d44e