Merge "Move system_shared_libs into target.bionic clause"