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

Change-Id: Iae85b41323cad125505b5212de518a7334e13938