Use standards compliant header locations am: 76492bc4ba am: bca9061010

Original change: https://android-review.googlesource.com/c/platform/external/oj-libjdwp/+/1969370

Change-Id: Ice142b7705091c226d9297152687a744defd45b9