Merge "Remove deprecated Android.mk files"