[automerger skipped] Merge "Convert oemaids_headers / passwd / group to Soong" into qt-dev
am: f9dca5e1 -s ours
am skip reason: change_id Ie3b92a499b44391e0692da5d9ad067089a62aabb with SHA1 d32e6d13 is in history
Change-Id: I63ce049fa3652a6c371f6857ef8a478a51af12b3