Merge "androidfw: Add support for compact resource entries"