Merge "Ensure local debug symbols are generated first." am: ae3c5cc582
am: bac4d025ca

Change-Id: I254077bf708c4699892d8958c2b345e6b340d84e