am 63e5d07e: Merge "Fix issue with project resources overriding framework resources." into gingerbread