Merge "Fix for issue 9656 - custom xml attributes in Android Libraries"