Merge commit '3d828e62c856074334a00ce7c621050b4d7166e4' into gingerbread-plus-aosp * commit '3d828e62c856074334a00ce7c621050b4d7166e4': Do not build pbkdf2gen on non-Linux hosts
Merge commit '3d828e62c856074334a00ce7c621050b4d7166e4' into gingerbread-plus-aosp * commit '3d828e62c856074334a00ce7c621050b4d7166e4': Do not build pbkdf2gen on non-Linux hosts