Fix errors found by prebuilt ELF checker am: 35a7a37667 am: a3c1307eba
am: f948d5af61

Change-Id: I425c85e2fb8462dcc4b157075c637c747de369aa