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