Merge "cppreopts: Android.mk -> bp"