fix build on cts_arm64 am: 626ccef033
am: 6a3adcb24c

Change-Id: I45b57168684281acfce76aac91fdadbf96e1c641