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

Change-Id: I5caa3ccfea38afff811d252467f4139e3ba06f05