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

Change-Id: Ibdda456b67c0d6d735b41c8319296a480c5662bb