modified to build as AOSP/CM app; respects FI-mode switch from system properties

...operty evaluation

Change-Id: I4e6a7da6b56a40c9b096a2620f292b878d94b636