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

Change-Id: I728bc0bc4ef63228948336eaac3200375764bf03