Merge \"Convert bzip Android.mk to Android.bp\"
am: 539c57493a

Change-Id: Iedfc7c03682726126f9d534a41fb36bbd3c440b2