Manually update makefile for vndk-sp hidl libs. am: 282278fa9e am: 7cfdc92f66 am: 8f80b6fd9c
am: cc74a34528  -s ours

Change-Id: I5c5fab885ddd2bc9bef78552149423b9a4019850