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

Change-Id: I569f06d42bfcc8f47a8cb0addad7dbdcce5398f6