Fix build for API Level 24

Bug: 29392689
Change-Id: I0c54b57b7fcefcb905e22e50f3022bfb568b871a
3 files changed