Merge "Do not install assembled framework matrix to device."
am: c70978d890

Change-Id: I607c056eb99e558b9adf172262392767434243cc