am 52d293d3: am bb1a77bb: am 000bffab: Merge "New icons that eliminate location "crosshair" -b/8142654" into klp-dev

* commit '52d293d371eaa555da5cc312198e45f17d754c76':
  New icons that eliminate location "crosshair" -b/8142654
tree: 488c0a50a99740fd0f87b014a07016e359fb6101
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml