Merge \\"Support LOCAL_STRIP_MODULE := keep_symbols for prebuilts\\" am: aa3525dcf1
am: a00b2765cf

Change-Id: I703e53b7847fc4ff4b60972094d13670c3ad7207