Merge "Remove ref to non-existent dir in xml-generator's Android.mk"