am 35d34c67: am 3d828e62: Merge "Do not build pbkdf2gen on non-Linux hosts" into gingerbread
am 35d34c67: am 3d828e62: Merge "Do not build pbkdf2gen on non-Linux hosts" into gingerbread

Merge commit '35d34c67b7e94639086f2392d674e59b82c26a42'

* commit '35d34c67b7e94639086f2392d674e59b82c26a42':
  Do not build pbkdf2gen on non-Linux hosts

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base