Merge "Use correct install paths in generated Android.mk"