Merge tag 'android-6.0.1_r3' into 601r3

Android 6.0.1 release 3

* tag 'android-6.0.1_r3':
  Add a path variation for dragon device

Change-Id: Ibfcad02753e99fdade305abe99a91b3812b81948