Merge \\"Update the DP4 setup instruction for api level 24\\" into nyc-dev am: 627bca6e80
am: 6ed6dba025

Change-Id: Ifbf470eb68a2931365271d49b0de3245033de7c5