Merge "Removing -std=c++14 from bootstat Android.mk"
am: 4606c95760

* commit '4606c9576019ac419b7abd83eb3a7dcd1f16df81':
  Removing -std=c++14 from bootstat Android.mk