Merge "Remove the module-lib-api target" am: 36bd16e5ab am: 0a354a95f4 am: 0a111c1280

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1480536

Change-Id: Iaaf18128d1c26b928ca4d0cfdfa470c226887ebe