am 24d2adba: am 188d4396: Merge "Change /dalvik-cache to be owned by root."

* commit '24d2adba7a2f9caa82a88be70ad2fe7397ab310a':
  Change /dalvik-cache to be owned by root.