Merge changes Ic378d0e5,Ib3a8696a am: da5d7ec6a7 am: ee60aa6a9b

Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/1552949

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icd76d89a82d41184004fc3edce190bf6b8d226b7
tree: 8856b2e40654686083ae50dddc87e27e3f4edbfa
  1. bpfloader/
  2. libbpf_android/
  3. progs/
  4. Android.bp
  5. NOTICE
  6. OWNERS
  7. PREUPLOAD.cfg