Merge "Use non-hardcoded advertisement data size" am: accbf4d67a am: 1b84d5769c am: 5d0eb83017
am: d5913b8bd8

Change-Id: If9feab550757acf28d5ecf53e346b3e121c9cbdf
tree: 6987201893a670a40f6252d44b3c6d334f768f79
  1. android/