Merge "libcutils: compile with BOARD_VNDK_VERSION current" am: f358bed624
am: dd9a91f109

Change-Id: I6006b664c42faa2d135e040321e9cd48589e2710