Merge "Allow non-references to be copied between AssetManagers" into qt-dev
am: 4108c7fca4

Change-Id: I237510de38a281f474a5080cba5aa448f5ccd537