Merge \"Convert libelf from Android.mk to Android.bp\"
am: adc7fa7b8e

Change-Id: Id33ffd978656745723ffd7640c8b3a6638d91c3a