libcore legacy inclusion fixed for Android compilation
Fix creation of aliases
Don't break the factor table