am beeb71df: fix build

Merge commit 'beeb71dfd4ffe635daba3745515bb392f7c5ada2' into gingerbread-plus-aosp

* commit 'beeb71dfd4ffe635daba3745515bb392f7c5ada2':
  fix build