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

Change-Id: I7b7dd19e619c0578481ef0fd80e06bef5b9eaeab