Merge "Change /dalvik-cache to be owned by root."