Merge "libcutils: compile with BOARD_VNDK_VERSION current" am: f358bed624 am: dd9a91f109 am: ae4c956012  -s ours
am: 5cc4d19c13  -s ours

Change-Id: I6e64d77b7060ba44bbe1eda87e71b0eb3a28be1b