am f98e18e6: am d9f98c81: Fix build break due to merge.

# Via Android Git Automerger (1) and Jean-Baptiste Queru (1)
* commit 'f98e18e68d82dbb508bf2deafa63bcdca643e125':
  Fix build break due to merge.