Merge "Convert lib to Android.bp" am: 06187ec1dc  -s ours
am: 82cb6b3563

Change-Id: Ia5dd0efc1fa50e3af64380b2cb955f4f04f1bd9b