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

Change-Id: Id96cdca298e44f0cfee347c1be82cd22222d24ba