am 965fa22d: am 039cd7e0: Merge "Add LOCAL_NO_FPIE."

* commit '965fa22d85aa1af3974c5f32e3c3325e66781f73':
  Add LOCAL_NO_FPIE.