Bug: http://b/21695943 Change-Id: Iadb600b2ae619515d7038a4db9bf464ba31adb36 (cherry picked from commit 895241efbba344c1590b76fcada89c48f4743cf2)
Needed for building gdbserver out of the box. Bug: http://b/21695943 Bug: https://code.google.com/p/android/issues/detail?id=86712 Change-Id: Ieadda2b595f08bfddfa61fcd68006b8e7c1a438d (cherry picked from commit bf18c61798d1ae9197ae087ed85e94eef55e8678)