Merge "Fix Android.mk files for plugins on darwin."