Revert "Update ump leaving the mali driver at r2p4"

This reverts commit f9d009d56eff975cf7db0122b16428e8fd357ac2.
merged with opensource 7100 update1
merge with opensource 7100 update1
fix inline statment