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

Change-Id: Ied7c3bff4602388b14d579784d77d2e3c87c14b5