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

Change-Id: I1002a91ab692ffca51d1290c39901b498b96e75d