Switch back to aosp frameworks/opt arrghhh!
Signed-off-by: Paul Beeler <sparksco@gmail.com>