[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 am: b32952b8 -s ours am: a36b53d9 -s ours
am skip reason: Change-Id Ie77c17a96a67016f35890afa065bea0a07b09504 with SHA-1 473501ff is in history
Change-Id: Iffc2864644c198bdbd9a4cd0b2d17261fa23f9cd