Merge "Removing -std=c++14 from bootstat Android.mk"