nypon: path changes for jellybean

Change-Id: I87c6d28e040b6b2e0d67fc1c2caaf83cb92d0afa