Merge "Version __system_property* symbols for lp64 platforms" am: c8018993f7
am: a27ec1a5d2

* commit 'a27ec1a5d222bdc626086686cbce6e99de970596':
  Version __system_property* symbols for lp64 platforms