am 9b125b04: handle old-style CACHE: packages

Merge commit '9b125b04c6ba8f07d8aa6494d58917a596443dc5' into gingerbread-plus-aosp

* commit '9b125b04c6ba8f07d8aa6494d58917a596443dc5':
  handle old-style CACHE: packages