Fix errors found by prebuilt ELF checker
am: 35a7a37667

Change-Id: I5c0c03836ecf7cbee9a9707dd88b50f90618c42f