Merge commit 'android-4.1.2_r1' into merge_branch

* commit 'android-4.1.2_r1':
  Unhide rtld_db_dlactivity()
Merge "Merge commit 'android-4.1.2_r1' into merge_branch"
Update copyright to The Linux Foundation

Change-Id: I60cd33604f1e876623a9fd4ccc240081f5256baa