Merge "Fix pre-extracted PDKs"
am: 344f2524fc

Change-Id: Idaff5ee1c4b1869706aa82e7ea9e0ebc33332603