Double commit in R1.10 to cleanup tools/packaging/third_party/Makefile.
mainline commit was 19b4f9397c30380e9f58f843ea6294b0e2f649f0

Change-Id: Id4d1f43e9f6bf57ca2c023c13b22fc0924edcf10
Merge "Double commit in R1.10 to cleanup tools/packaging/third_party/Makefile. mainline commit was 19b4f9397c30380e9f58f843ea6294b0e2f649f0" into R1.10