Merge "Everyone -- even "NDK" users -- gets C++14 by default now." am: 253a37bd15
am: 5b20714e70

Change-Id: Ice354f4ef1dbd16a4d00e7b843c2ccf5e4c5101f