Android O MR1 IOT Release 1.0.7 (5157592)
Merge "Prevent dependency cycle due to system_shared_libs expansion"