Android O MR1 IOT Release 1.0.5 (5014699)
Merge "Build both of static and shared libs." am: ec365b3787 am: 94d2512ef4 am: 15597ad460
am: 757884d3a8

Change-Id: Ifd89583530d08a0f37095ffb836605ea0c0131f3