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

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