Merge "libcutils: compile with BOARD_VNDK_VERSION current"