Merge "msm8974: remove from top level makefile am: 583ecf5ed2 am: 4e3df672cb" into nyc-mr1-dev-plus-aosp