[automerger skipped] Merge "Remove conditional enabled status on libbcc" am: 255c91b8af am: 966373b53f am: eb311049c7 am: 66a629212a am: c7d988f4fd -s ours

am skip reason: Change-Id I13bdda506bbba7d41067c82657b5e0446efc8cb6 with SHA-1 cf43c2ccca is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/compile/libbcc/+/1406767

Change-Id: Ibf53064e0bc8ee2ee85406e16d35cfa9a9d0d5e1