[automerger skipped] Merge "Disable shared library support for framework modules" am: a26485fa50 am: f94b26a8e9 -s ours
am skip reason: Change-Id I3e78994a9855110b02c3d71944ff38b986208e9a with SHA-1 4147550acd is in history
Change-Id: I5b6ae7fd0d48b9c23b4b350b655e91ec55d31bcc
This commit is contained in: