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

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

Change-Id: I28c6d399d82936bdedee7a0ccaef009a40fd0b13