Merge "Moved source to match upstream file structure" am: 7d62b5836f
am: 7c60256c23

Change-Id: I471843ee7d264fd2deae81772d9f85879deb8153