Merge "Handle shared libraries for split apks." am: 9487dff8ab am: dae160f51b
am: 98f62d8aa0  -s ours

Change-Id: I014165037e367e1012a21e288f21194f5036585a