Merge \"Merge \\\"Cache resources needed to sort media sizes.\\\" into nyc-dev am: 142fc425c4 am: c6bddb8261\" into nyc-mr1-dev-plus-aosp
am: 219e11ef9d

Change-Id: I08f41cbaa1f81d234aa04cff7d6332304b9a75bf