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

Change-Id: I2a8eae7807332bc449e23976051930e6b1f769e6