Merge "Fix proguard flag file dependency." into gingerbread