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

Change-Id: I15c4bd84e30894602517c9bd91be6a0c40ae8133