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

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

Change-Id: I312eb37caed125f12fd3bd8c4e3e1741062b2810