Merge \\\\"Convert bzip Android.mk to Android.bp\\\\" am: 539c57493a am: b0e77c4d65 am: 995696018e
am: 2cb42e2caf

Change-Id: I66d9788db0ce427e84d651a23459dfd2d223d2e6