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