[automerger skipped] Merge "Revert^2 "Enforce <uses-library> check for Android.mk modules."" am: ae6bdc0c74 -s ours

am skip reason: Merged-In I21712e5197b3cb06e82e476f4c2f7277142034e9 with SHA-1 41a2ed7460 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1706689

Change-Id: I5f028cc625e004fa712273fbb2a12f2a7b74e8f6