Merge changes from topic \\\'libcutils_soong\\\' am: 25e2114232 am: dd01471473
am: 2f2e488992

Change-Id: Ib27c51e451eb190d0f46fe15a01d6269e5ffaa87