Merge "simpleperf: fix reading kernel modules on Android." am: 9e4ad1520e
am: 32f0d37c82

Change-Id: I97cd0cc3f16503b431bfc756554928fead3a3037