ANDROID: GKI: MGLRU ABI Fixup

 - Rename some struct members to match previous implementation
 - Reorder struct to match previous implementation
 - Fix up member types as in previous implementation
 - Keep the now unused header includes, deleting them
   causes 1000s of CRC mismatches

Bug: 249601646
Change-Id: I39fb30725ed03abbe078d97c7c86fb62e3e316c9
Signed-off-by: Kalesh Singh <kaleshsingh@google.com>