Merge "Revert "Fix non-existent module error"" am: d7cb6e1fd0

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1398410

Change-Id: I4903d5491e8e1106d486b0fdcc561f669dfe76e6