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

Change-Id: Idc1ad70ec01687eb23f2eff584751088f122e59f