Merge "Added OWNERS to Shell and hook to make sure it's developed on AOSP." am: 4384c5c241
am: 2ffd64805c

Change-Id: Ida97bc760fb5d26ace3ac1092f05b3b8fa7ede7f