Merge "Identify modules ready to be converted to Soong" am: c6bada8acd
am: 6596082d00

Change-Id: I2e814051643c339054ccc02ae2823a6c2fd80e46