Merge "libandroidfw: Do not clear last resource id in ResolveReference"