am 2d6a0c68: Merge "Fix proguard flag file dependency." into gingerbread

Merge commit '2d6a0c68c29c94b492a93d06d072568d767c1e72' into gingerbread-plus-aosp

* commit '2d6a0c68c29c94b492a93d06d072568d767c1e72':
  Fix proguard flag file dependency.