Merge "Make PIC/PIE levels compatible for LTO." am: 4be1d8823e
am: dc8469e858

Change-Id: I67e094ceff60ff01fa8636ca94d1dd0c19728256