[automerger skipped] Move common apishim classes to apishim.common pkg am:...
[automerger skipped] Move common apishim classes to apishim.common pkg am: 473501ff am: ea5b554c -s ours am: 38799fe8 -s ours
am skip reason: Change-Id Ie77c17a96a67016f35890afa065bea0a07b09504 with SHA-1 046bfa7f is in history
Change-Id: I2a066d4f766ecff6584a97e94fcbdef54b3acebb