am af6154f5: am ebd8b7dd: Fix issue #2395667: Pull LW Picker apk from Droid build

Merge commit 'af6154f52bb590f20f3700e1635776a76b805891'

* commit 'af6154f52bb590f20f3700e1635776a76b805891':
  Fix issue #2395667: Pull LW Picker apk from Droid build