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

Change-Id: I7d869cacc520447d4dd768f9de78e7441cf07935