Merge "Fix $(so_suffix) error."
Fix $(so_suffix) error.

Change-Id: I32cb4d4efe0a473e67a54c035df4dd82b6e4a3f0
(cherry picked from commit 80b71fa326e4b5d9510d528c8feb08e28376a350)
am 988251c9: Fix  error.

* commit '988251c92269676c891dcb548fecdc100755b431':
  Fix $(so_suffix) error.
am 6e9151b1: am 988251c9: Fix  error.

* commit '6e9151b1a7e035936cf671c83cf25fe7351e3c06':
  Fix $(so_suffix) error.
Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: I2c1659dba0eea86a4a76ee410608febbae466ef2
am ccf2f3dd: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge

* commit 'ccf2f3dd142d0ad973d913990a358d7fc6af2a8d':
  "JSS15"
Merge changes Id6de3e74,I1e96cbd7 into jb-mr2-dev

* changes:
  fix design/develop boxes float
  add style to add nexus 4 frame to screenshots
am d67d0227: Merge changes Id6de3e74,I1e96cbd7 into jb-mr2-dev

* commit 'd67d02274da846184449ac02aba7eafdcba889b1':
  fix design/develop boxes float
  add style to add nexus 4 frame to screenshots
am 5951d1ea: am d67d0227: Merge changes Id6de3e74,I1e96cbd7 into jb-mr2-dev

* commit '5951d1ea0d7a85da510eb06f8b73e62113ef800a':
  fix design/develop boxes float
  add style to add nexus 4 frame to screenshots
Add inputflinger to build.

Change-Id: I4ae22cda74603c7cdcf09b9f63b31616b1f8e345
Remove old system server binaries that are no longer needed.

Change-Id: I76a56ee786decce9729f8f93244bdd04cbad4877
"KRS15B"
Add LOCAL_ADDITIONAL_DEPENDENCIES support to BUILD_PHONY_PACKAGE

Change-Id: I0211600ebb554b55f3823a4cb3d119b95cb49733
JSS15B
merge in klp-release history after reset to master
"KRS16"
Allow several system property files

TARGET_SYSTEM_PROP now is a list of files and all of them
are included in the build.prop.

Change-Id: I494f86412b0a299ee4c066e49ab4f4686bc2178a
Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: I8a36562b71e8ca51a52e9e893f3fb302ea414f24
am eed1a599: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge

* commit 'eed1a599f03dd5da3cd449ce21c7767770ebb29d':
  JSS15B
"KRS16B"