Also changes it to use app:menu instead of inflating the menu in Java. Change-Id: I140fb042c8ea77b5a7c889abf50a1a7926e2dc8b