[automerger skipped] Merge "Build module common libs as system_current" am: da0445a3fc am: 85223eb994 am: 7ca5d3fb1a -s ours
am skip reason: Change-Id I2ea2be0039b67ba34fc26e62bdb839ab7d42300c with SHA-1 48d002718f is in history

Change-Id: I010fcd11d39ed6ab3dc152f10835bb2070e76974