The way of get flavor is change to get it from instance object,
need to update code to meet this change or driver sync up code
will fail. Also fix some other problem.
Change-Id: I8e79d7859b79e9d9736a1ba3c25ca56752cae6f8
Closes-Bug: #1432947
(cherry picked from commit 1baeb54222)