Merge "Fix non-existent module error" am: 1173476551

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

Change-Id: I5f7e98723834ca9c2bdb4175d894a4a6a8177c5b